Merge pull request #1205 from petegriffin/hikey-protect-memory

author davidcunado-arm <[email protected]>

Fri, 26 Jan 2018 17:29:36 +0000 (17:29 +0000)

committer GitHub <[email protected]>

Fri, 26 Jan 2018 17:29:36 +0000 (17:29 +0000)
author davidcunado-arm <[email protected]>
Fri, 26 Jan 2018 17:29:36 +0000 (17:29 +0000)
committer GitHub <[email protected]>
Fri, 26 Jan 2018 17:29:36 +0000 (17:29 +0000)
diff --cc plat/hisilicon/hikey/hikey_bl2_setup.c
Simple merge
diff --cc plat/hisilicon/hikey/platform.mk
Simple merge
author	davidcunado-arm <[email protected]>
	Fri, 26 Jan 2018 17:29:36 +0000 (17:29 +0000)
committer	GitHub <[email protected]>
	Fri, 26 Jan 2018 17:29:36 +0000 (17:29 +0000)
		1	2
plat/hisilicon/hikey/hikey_bl2_setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
plat/hisilicon/hikey/platform.mk	patch \|	diff1 \|	diff2 \|	blob \| history